Merge pull request #9 from nuvtec/master

Merge pull request #10 from AbelAguiar/master
Merge pull request #13 from AbelAguiar/master

Merge pull request #9 from nuvtec/master