Merge pull request #1 from mkobar/gh-pages

update master