Merge pull request #20 from JairoAlonso25/master

merge with corrections
Merge pull request #21 from JairoAlonso25/master

Sync
Merge pull request #9 from pedropaG/master

Sync