change caller to global space, and references to underscore
Merge pull request #2 from ppazuchowski/master

change caller to global space, and references to underscore