Merge branch 'hotfix/48'

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

- Based on phpcs report
Merge branch 'hotfix/phpcs' into develop

Use phpcs instead of php-cs-fixer