issue #21 resolved