fixes
Merge pull request #21 from jerseyschorr/cleanup

fixes