Merge pull request #2 from karbowiak/master

Scrotomizer fixes