Add small changes. Use python re module in parser.py