Merge branch 'master' into gh-pages
fixes
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
fixes
Merge pull request #5 from mfanafuthi/master

fixes again