Fixed #69. Cleanup of the parseExpr() method. Changed a switch to a conditional after removing all but one case from the switch.