fix regular expresion and refactor
0.0.9