Fixed GitHub #2 - Memory Leak