Merge branch 'hotfix/0.2.3'
Merge branch 'release/0.3.0'
Merge branch 'release/0.3.1'
Fix naming of outpit files
Merge branch 'hotfix/0.3.2' into develop