Merge #1 and use php-cs-fixer to make PSR-compatible