Merge pull request #1 from mkobar/gh-pages

update master
Merge pull request #2 from mkobar/master

Merge pull request #1 from mkobar/gh-pages