Merge pull request #3 from purplecabbage/Cleanup1.2

Cleanup1.2