refactoring and release 1.0.1