Merge pull request #1 from chrisvdp/master

Master
Merge pull request #2 from chrisvdp/gh-pages

Merge pull request #1 from chrisvdp/master