Added simple expression parsing and support for + and - operators