Merge pull request #4 from hmakauskas/master

Merge pull request #7 from HenriqueBA/master
Merge pull request #8 from HenriqueBA/master

Merge pull request #4 from hmakauskas/master