fixed lack of break call
Merge remote-tracking branch 'origin/v1.0.0' into v1.0.0