Merge pull request #77 from chylex/master

Merge pull request #35 from ProPercivalalb/master