merge sammuel branch to master