re #36 backporting release 0.3.3 changes back to trunk