refactoring, etc
move to 0.0.8