modify for adding Location API
merge version 2.0.3.47 modification
Update for Version 2.0.3.47