CALC-203 and CALC-207
Merge branch 'master' of github.com:openforis/calc
CALC-203 and CALC-207