Revert "Merging with ronaldme:master"
Merge pull request #3 from mattm401/revert-1-master

Revert "Merging with ronaldme:master"