parser good
Merge pull request #5 from obf73/parser_refactor

parser good