refactor previous merge
Release 0.6.3