Merge #3 add new api