Merge pull request #16 from DennyWest/revert-4-master

asdf