issue #22 resolved