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

further clean up