Update master
Merge pull request #30 from hugocastalleda/patch-1

Update master