issue #81

in progress
issue #81

fixed