cleanup
Merge pull request #1 from mitzerh/develop

cleanup