My changes
Merge pull request #1 from rodolfohermans/master

Hi, please pull my contributions