Merge #4 add more api