sprinkled local around
Merge pull request #30 from DogFoodSoftware/topics-24-fix-global-vars

Pull request for issue #24