Fix bugs in the previous commit
Merge pull request #279 from tpetricek/gh-pages

Fix bugs in the previous commit