refactoring
updated to 0.0.7