Merge pull request #1 from oraricha/master

pull request of github live changes to master into gh-pages