Fixed issue: #20

Fixed issue #20