Merge branch 'master', remote-tracking branch 'origin'
added tests to confirm running and retreating when hidden (#171)