RdB's Geofield mods merged into fillerwriter's master branch