resume
Merge pull request #3 from mbubb/cleanup

resume