Issue #317
Merge pull request #318 from jamland/gh-pages

Issue #317