cleanup
Merge pull request #11 from mmoll/cleanup

cleanup