Patch v0.5.2