Merge pull request #1 from ckdarby/master

Handful of changes.
Added composer.json.