Better fix for stupid rounding issue
fix indentation
Merge branch 'master' into kriging