Add changes suggested by Marek
Merge pull request #1 from Zamber/gh-pages

Add changes suggested by Marek