htr3n Merge pull request #29 from andrealmeid/master …