fixed error in functions
fixed error in functions, merged master