Update funfactory to latest master.
Merge pull request #49 from akatsoulas/update-funfactory

Update funfactory to latest master.