Simplified error estimate parameters, changed default tolerance.
Merge branch 'master' of github.com:scafacos/scafacos