Add missing break statements in switch, add default case.
Merge pull request #582 from atgeirr/fix-switch-fallthrough

Add missing break statements in switch, add default case.