Added GoodbyeWorld
refactored GoodbyeWorld and added a test.
Merge branch 'master' into merge