adding finishOnSignal

![f58zsmp](https://f.cloud.github.com/assets/678338/649839/2de80952-d44e-11e2-9701-627919f4dade.gif)