'Hotfix' merge to get codestyle enforcement into repo ASAP - development not finalized
Temp fix for #28 (closed)