issue #2 resolved - first commit
issue #2 again resolved