Merge branch 'hotfix/3'

Close #3
Use phpcs instead of php-cs-fixer
CS fixes

- Per a run of phpcs
Merge branch 'hotfix/phpcs' into develop

Forward port #8