work on issue #112
work on issue #113, issue #100