Uncommenting code

Oops. :)
Merge branch 'gh-pages'