add basic funcs
merge master