Merge branch 'hotfix/misplaced_file'
Merge branch 'release/v0.0.6'