Merge pull request #334 from Vexatos/master

Added more localizations
Changed replace to replaceAll