Remove a memory leak

Hello @majelbstoat, 

Please review the following commits I made in branch 'nick-memleak'.

72df66aaae8651573cdf4278f04b43dbefb2c3b1 (2014-02-24 20:52:03 -0500)
Remove a memory leak

R=@majelbstoat