Merge pull request #1 from orgrune/gh-pages

Hey
Merge pull request #2 from orgrune/master

Merge pull request #1 from orgrune/gh-pages