Merge pull request #42 from victorbetha/master

F