Merge branch 'feat/tagfunc'