Merge pull request #23 from Williangalvani/master

master
Merge remote-tracking branch 'upstream/master'