Merge pull request #17 from DennyWest/master

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

Merge pull request #17 from DennyWest/master