Fix a memory leak
Work around #90
Merge pull request #109 from rsrock/rsr/osx

Work around #90