Merge Rik's changes into fillerwriter's master branch.
Merge pull request #1 from RikdeBoer/master

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