Fixed issue #5
Merge pull request #14 from jorio/fix-issue5

Fixed issue #5