add basic func
Merge branch 'dev'