Proper End Game?

Fix for #27