Merge branch 'dev' into gh-pages
Merge branch 'gh-pages' into dev
#3