Master geo

Completion of https://github.com/dereuromark/tools/pull/61