Merge pull request #659 from NeoRaider/default-language