Revert "Wcjohnson11/dev"
Merge pull request #39 from Azix/revert-37-wcjohnson11/dev

Revert "Wcjohnson11/dev"