Issue #5: Fixed.
Merge pull request #8 from febrezo/issue-05

Issue #5: Fixed.