fixes #5 (by way of a data set) and fixes #9
fixes #10
fixes #11
Merge branch 'master' into gh-pages