Fix formatting
Merge branch 'master' of https://github.com/dtg3/sevo-git-research
Fix runtime errors