Update for API changes (Fixes #84)
Merge branch 'gh-pages_develop' into gh-pages