ttheune Merge pull request #8 from ttheune/cleanup