Merge pull request #4 from allenz456/master

Merge master into gh-pages
Closes #5