Minor change
+ suppression option for "Goodbye" message