Merge pull request #36 from rbsloot/master

Tried some fixes for Internal Function Factory (no succes) + more in comment