issue #29
Merge pull request #32 from DavidPinho/issue-29

issue #29