Fixed issue: #20