*** Code freeze to support Internationalization work. Will accepts pull requests 29th of May ***