Stop Added

Added stop condition (though not tested yet, as no selection)