Made the skipping a bit less "hacky"
Merge branch 'master' of https://github.com/bourgondaries/sauce