Revert "Revert "Added Whales and fix issue #116.""

This reverts commit 59ab704f09a07d89d2aafb785a28a62b5a0ebd81.