v 0.0.1b beta
refactoring