Join project (17/18)

Join project