Merge pull request #6 from b02197/gh-pages

pull
Merge pull request #7 from b02197/gh-pages
Merge pull request #8 from b02197/master

pull