fill out Point api
Merge branch 'dev'