Push #236 and #237 to website.
Merge pull request #238 from nicksay/gh-pages

Push #236 and #237 to website.