Simplified error estimate parameters, changed default tolerance.
Merge remote-tracking branch 'origin/master'