Added support for geo and quad codes.  Minor refactors
Merge remote-tracking branch 'upstream/master'

aking josh's update in