Add I18n support
Update stuff to add new features and change existing ones