Checked in upstream version 0.3.0