Fixes #20: Fixing path
Merge branch 'Fixes#20' into develop