Resolves #16 and fixes #17
Merge branch 'master' into gh-pages