Added Composer support
Removed extra comma
Merge branch 'master' into composer