Fixed exit; break; (unreachable code)
Merge pull request #168 from amenk/patch-1

Fixed exit; break; (unreachable code)
Merge remote-tracking branch 'refs/remotes/origin/master' into dev