Issue #39 resolved