Merge pull request #5 from gamedevpl/master

merge from master to gh-pages