Merge pull request #76 from chylex/master

Merge pull request #34 from ProPercivalalb/master