Merges pull request.
Merge branch 'iKahvedzic-gh-pages' into gh-pages