gdovicak's changes
Merge branch 'gdovicak-gh-pages' into gh-pages