Fix #14
Upgrade to functionParser