Feature Freeze

Last push to public repo before bringing the code up to Python3.