Merge pull request #16 from mgeiss/develop

code clean up