Closes #62
Merge branch 'develop' of https://github.com/PHPSC/phpsc-conf into develop