Merge pull request #239 from victorbetha/master

dfxfda