Merge pull request #3 from wuggyboo/master

kj
blablablabla
Merge pull request #4 from wuggyboo/gh-pages

bla