Format problems resolved
Merge branch 'hotfix/0.3.2'