cleanup
Merge pull request #27 from grosser/grosser/cleanup

cleanup