Add missing break in switch
Fix version and authors
Final format + Organize imports
Merge pull request #166 from flexiblepower/development_tom

Final clean