Minor tweaks as suggested by Shadi
Merge branch 'master' into gh-pages
new build, minor tweaks