fix parse_condition
fix parse_condition
Merge pull request #12 from itbdw/dev

Dev