Addresses #112