new changes for sambot
Merge branch 'master' into samtestbranch
Merge branch 'samtestbranch'