Updated changes from https://github.com/neilang/NAMapKit/commit/9e8d44f0a17ed8ec3b17a9d29a147dcdde89f9e4.