Merge pull request #35 from MichalPaszkiewicz/master

Master
Merge pull request #36 from MichalPaszkiewicz/gh-pages

Merge pull request #35 from MichalPaszkiewicz/master