Multiple function name support, regex fixes
Merge pull request #13 from juhana/master

Multiple function name support, regex fixes