Merge branch 'dev'
fill out Point api