Merge branch 'master' into gh-pages

trying to fix things..
detee everything