changed heading
Merge branch 'master' into debug
Fix error reporter problem