refs #6 : Corrections before release 0.6