Merge pull request #55 from ksuther/develop

Duplicate code removal, adding missing break, and changed indent settings.