Added composer info, license and README updated
Fix merge problem