Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
Merge pull request #2 from smikhalevski/master

Sync gh-pages to master