fix parsing of NOT and CONDITIONALS bug
Merge branch 'master' of github.com:puconghan/plt