Who and what
Merge pull request #2 from CirrusMio/make_it_say_who_and_what

Who and what