Todos los Thai
Merge branch 'thai'