Better stopper
Merge pull request #9 from uribefache/stopper_stop

Better stopper