added gamma
Merge branch 'local-tstbranch-2'