Fixed geom module to use oo.prototype properly
Merge branch 'fix-geom' into dev