Merge pull request #5 from czmarc1/gh-pages

Merge pull request #4 from czmarc1/master
Merge pull request #6 from czmarc1/master

Merge pull request #5 from czmarc1/gh-pages