major refactoring
version 0.2.0