Merge pull request #32 from ProPercivalalb/master

Gimme updates!
Fixed possible memory leak
Merge pull request #74 from chylex/master

Fixed possible memory leak