fixes bugs from sonar mode
Merge branch 'master' of https://github.com/mattjr/structured