initial version
regexp fix, config fix
refactoring