Merge pull request #5 from gamedevpl/master

merge from master to gh-pages
Merge pull request #6 from gamedevpl/gh-pages

Merge pull request #5 from gamedevpl/master