Some improv in FixCommonErrors
Merge pull request #178 from ivandrofly/patch-19

Some improv in FixCommonErrors