issue #7 is done.
issue #6 is done