Merge branch 'hotfix/changepath'
bugfix
Merge branch 'master' into gh-pages