fixing error
Merge branch 'master' into Jay
switched api key