Merge pull request #14 from tomgalloway/feature/update_config_with_key_id

Feature/update config with key
Merge remote-tracking branch 'upstream/master' into develop