misc
Merge branch 'master' into dev
moving geom calc to worker, added utils
Merge branch 'dev'