Add phpdoc
Merge branch 'master' into feature/junit
Add more phpdoc