#31 Changed the ResourceBundle to factory to better handle locales