0.5.2 with some much-needed fixes