Cleanup and refactoring
Cleanup and refactoring
Merge branch 'dev' of github.com:openforis/calc into dev