fixed more scrub issues
fixed more scrub issues
Merge pull request #57 from Kierz/master

more scrub issues