0.0.4

some refactoring