Merge pull request #1 from ptdorf/master

Merge pull request #1 from jpedro-barbosa/master
if you're not using et, fuck off
Merge pull request #3 from jpedro-barbosa/master

123