Make it break out instead of staying in.
Merge pull request #389 from nZEDb/dev

Make it break out instead of staying in.