initial cleanup
Merge pull request #2 from steppobeck/develop

initial cleanup