fixed issues with scrubs
fixed issues with scrubs
Merge pull request #55 from Kierz/master

fixed issue with scrubs
Pull from upstream