Fixed class name issues
Fixed some phpDoc
Update composer.json
Merge pull request #5 from Intrepidity/master

Fixes issue #4