closes #112
closes #110