merge master into gh-pages for live demo updates
Merge pull request #15 from ty-/gh-pages

merge master into gh-pages for live demo updates