Added api key to configuration key
Merge remote-tracking branch 'upstream/master'