issue #36 resolved