Support for multiple custom functions
Fixed indentation in changes (removed hard tabs)
Merge pull request #2 from Jamil/master

Support for multiple custom functions