Merge pull request #9 from nuvtec/master

Merge pull request #10 from AbelAguiar/master