added parsing expressions in Parser class
merge
merge
merge
merge
merge in shell
merge
fixed member already defined in Parser
Merge remote-tracking branch 'origin/patrick-branch'