issue #2 resolved - second commit