Fixing memory leaks
Merge pull request #14 from bh2yoon/master

Fixing memory leaks