add unit test
simplify api:modify generate from get
simplify return object
add unit test
simplify api:modify generate from get
simplify return object
resolve the conflict