update version 1.3, refactor codes