WIP
More WIP.

   Just noticed trailing whitespace is getting removed. Need to check whether
   in this case it matters.
Merge pull request #1 from jkarni/gh-pages

Merging Julian's corrections.