Feature/thai solar