refactor
release 0.6.1