Added pseudo testcases
Added support for other function definitions
Merge pull request #25 from Hopiu/expressionRegex2

Expression regex2