Revert "Merging from wcjohnson11/dev-three"
Merge pull request #49 from Azix/revert-48-dev-three

Revert "Merging from wcjohnson11/dev-three"