added getJson back
merge from origin