Revert "Various changes"
Merge pull request #69 from Tundra-Python/revert-68-master

Revert "Various changes"