Add MAPI key option.
Merge branch 'master' into plotting