issue #3 fixed
issue #1 fixed