Merge pull request #747 from poolifier/multiple-functions