Fix (merged)
Merge branch 'gh-pages' of github.com:dtwood/2584 into gh-pages