Updating shell plugin with suggestions from #118