Merge pull request #283 from MirServer/add-geom

Copy geometry headers from Mir