Memory leak fix
Clean up
Merge pull request #1 from elfenlaid/profiling

Profiling