fix when autostop
Merge pull request #87 from aenario/master

fix when autostop