Merge pull request #202 from nate-yocom/master

Fix memory leak + Fix issue 199