Folder fix
Merge branch 'release/0.3.0'
bug-fix
Merge branch 'develop'