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

Fix doctrine annotations
Merge remote-tracking branch 'upstream/master' into combined-checkouts