Merge pull request #22 from edwardcapriolo/cleanup-before-merge

Whew