Modifiying default to accept a function or value
Matching coding style
Merge pull request #6 from plus3network/master

Modify default to accept a function or value