Minor bugfixes
Removed some empty lines
Merge branch 'hotfix/2.0.3.3'