WGS84 token fixes

Solves #627 
I have "piggybacked" this script in this PR. It is a very small thing... please, dont be too hard with me for not including the `-u` ;)