Corrected codestyle according to PSR-2
Removed echo-debug code
Merge branch 'hotfix-0.1.1'