added  and , cleaned up
Merge branch 'master' of https://github.com/b3n01t/logicParser