Merge pull request #359 from haus/ticket/master/doc_1230_update_example_keys