update regex for function name and args, remove needless split(), join()

Fixes: #15