Remove register feature
Update to phpdoc2
Merge branch 'master', remote-tracking branch 'origin'