option to parse key if missing
Merge remote-tracking branch 'origin/master'