refactoring
vow up to 0.3.7
0.1.9