issue #19 resolved and tested