Adding Marco's 1.0.3 changes.