resolve problem #55
Merge branch 'map_search' into map_search_kanpe