Merge pull request #3 from hmakauskas/master

Merge 3
Merge pull request #7 from HenriqueBA/master

Merge pull request #3 from hmakauskas/master