Fix doctrine annotations
Merge pull request #22 from jerv13/master

Fix doctrine annotations
Update docs
Merge pull request #23 from jerv13/master

Update docs
Merge remote-tracking branch 'origin/master'