Towards 0.6.2
Fix #276