Feature/nslocalizedstringsupport