International regulation of whaling : from conservation of whaling to conservation of whales and regulation of whale-watching