merging v0.5.2