issue #192 resolved for master