Fixed Issue #20
Fixed bug
Fixed test
Merge pull request #43 from 66Ton99/issue-20

Fixed Issue #20