Merge pull request #39 from MichalPaszkiewicz/gh-pages

update master
blah
Merge pull request #40 from MichalPaszkiewicz/master

Master