basic functions functionality
merge master