Took a stab at this, issue #69
Merge branch 'master' into gh-pages