Merge pull request #2 from jtenner/development

Development
Update Composer.js
Merge pull request #3 from jtenner/master

Update Development