Avoid global function
Merge pull request #121 from thinca/avoid-global-func

Avoid global function