A bunch of small updates
Merge pull request #1 from kosigz/gh-pages

A bunch of small updates