Merge pull request #95 from mikeubell/Whales

Whales