Merge pull request #1 from shakie/master

Small refactoring of property names, adding ability to aggregate from model
Updating PHPDoc for some method signatures