Potentially fixed a problem with latitudes.
Merge origin/master