Merge branch 'master' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'master' into gh-pages
Merge pull request #1 from parano/gh-pages

update