including the atlas construction using a bayesian approach
Merge remote-tracking branch 'upstream/master'