Completed Issue #109 fixed issue #99