Fix for #25 - Map location should be remembered.