Merge pull request #2 from czmarc1/gh_pages

Merge pull request #1 from czmarc1/master
Merge pull request #3 from czmarc1/master

Merge pull request #2 from czmarc1/gh_pages