Pushing changes upstream that are for the project
Merge pull request #29 from vhalbert/cleanup2.0

Clean up 2.0