fixing more cases
Merge branch 'master' of https://github.com/floored/smswoop