Fixes issue #7 - Possoble memory leak