Merge pull request #1 from b02197/master

pull
Merge pull request #2 from b02197/gh-pages

pull