update and refactor package
1.0.8