master branch ver 1 fixes