Performance improvement (work in progress)
Merge branch 'master' of github.com:openforis/collect