added logging to calculate
Merge branch 'master' into stable