Added English and Spanish support