Corrected codestyle according to PSR-2
Merge branch 'hotfix-0.1.2' into dev