Safely wrapped everything in a closure
Merge pull request #20 from goakley/master

Safely wrapped everything in a closure