Hotfix
blue
Merge branch 'newfeature2' into gh-pages