Merge pull request #13 from nubs/master

Update composer