updated with master
Merge pull request #60 from ty-/gh-pages

updated with master