Facelift, plus fixed a leaky global or 2
Merge pull request #8 from juanpaco/facelift

Facelift, plus fixed a leaky global or 2