correct parsing of complex expressions#6

Miha-ha wants to merge 2 commits intoalexkappa:masteralexkappa/exp:masterfrom

Miha-ha:fixParserMiha-ha/exp:fixParserCopy head branch name to clipboard