Fix #84 by returning function instead of string
Merge pull request #89 from sritchie/patch-2

Fix #84 by returning function instead of string