more precise error computation
Merge branch 'master' into experiments