refactoring
updated to version 0.2.0