Merge pull request #1 from jjaspe/master

a
Merge pull request #3 from jjaspe/gh-pages

Merge pull request #1 from jjaspe/master