cleanups
Merge pull request #5 from mauimuc/master

cleanups