Merge pull request #1 from bschousek/master

merge master into gh
Merge pull request #2 from bschousek/gh-pages

Merge pull request #1 from bschousek/master