Move from $Error to $_ in catch
add another menu item
Merge remote-tracking branch 'upstream/master'