Merge pull request #27 from pauldijou/master

Try to fallback before throwing error
Correct bug on L205 if lang is not supported. Remove ambiguity on variables names