yet more fixes
Merge pull request #5 from m-schrepel/master

yet more fixes