Hotfix/coding standard 2

this is the rebased version of #71