Merge pull request #307 from tspaeth/fallback-languages

fixing fallback languages a bit
wip()
wip()