pep8 fix
Merge branch '189_sg_patience' into vanilla_improvements