Revert "Revert "Merge pull request #1 from jrthompson33/master""

This reverts commit 096203a079be7fe19adf56b79e3e408aa4c6f07a.