Closes #112