updating the composer's version to 1.4
cleaning master after merge