Issue #19 resolved