branches for tau 32, tau 21, and CONF sample
Merging release into master.