added gamma
added delta
Merge branch 'local-tstbranch-2'
Merge branch 'master' into tstbranch