Merge pull request #3 from dagobailon/master

Merge pull request #1 from dagobailon/master
Merge pull request #4 from dagobailon/dago

Merge pull request #3 from dagobailon/master