strip key if has spaces
Merge branch 'key-has-spaces'