Merge pull request #16 from oneski/gh-pages

test
Bug Fix
Merge pull request #17 from oneski/master

update to master