refactoring, bugfixing, raise version to 0.0.2-SNAPSHOT