half implemented #16 but...
Merge branch 'master' into gh-pages
'deploy'