Update for version 0.5.5 (amended)