Support languages with spaces
Merge pull request #508 from tfausak/languages-with-spaces

Support languages with spaces