refactor, new version release 1.2