This closes #112