more fixes
Merge branch 'develop'
upstream/master -> gh-pages