Minor bugfix with naming of directories
Merge branch 'develop'