Merge pull request #36 from ProPercivalalb/master

Merge pull request #77 from chylex/master
Merge pull request #78 from chylex/master

Merge pull request #36 from ProPercivalalb/master