some refactoring
release v0.1.1