issue #43 - callable defaults are no longer used as defaults
Merge pull request #48 from tisdall/master

issue #43 - callable defaults are no longer used as defaults