Fixed #4: composer.json for Composer support.
Merge branch 'wilr-master'