refactor
version 0.0.2