Merge pull request #1415 from ahgittin/expression-parsing

Expression parsing