Button for #133 - Partial fix for #112