Beginning contrib integration
Merge branch 'master' of https://github.com/Baltha/E09-PHP