Fine tune after merge, update version to 0.6.2