Merge pull request #74 from chylex/master

Fixed possible memory leak
not formatting for those bits
Merge pull request #33 from ProPercivalalb/master

Gimme updates!