Issue #34 resolved