Cleaned up code.
Merge branch 'origin/gh-pages'