Merge pull request #6 from AWisdom/master

Merge pull request #5 from AWisdom/gh-pages
Merge pull request #7 from AWisdom/gh-pages

Merge pull request #6 from AWisdom/master