Issue #151 Fixed garbage collection