Javadoc
Merge branch 'master' of gh:marcojahn/phrs