Added new `kill_on_scatter` option
Merge pull request #101 from astrofrog/kill-on-scatter

Added new `kill_on_scatter` option