further clean up
Merge pull request #11 from pisi79/master

further clean up