Revert "Merge pull request #41 from darnould/devbranch"

This reverts commit ee8624a37f00b97c8e84d6ab4b7b3463c4e914a5, reversing changes made to 4c73e488736a29e9186c89c97f0fce4a5346da55