Add stop feature. Fix #14