Issue #191 - Generates excess garbage on close
Merge pull request #192 from trevorbernard/master

Issue #191 - Generates excess garbage on close