Merging some improvements from BCT

2009-09-24, laurent