Regex refactoring
RegExp FIX: RegExp with "g" should not be used for simple match multiple times (http://stackoverflow.com/questions/2141974/javascript-regex-literal-with-g-used-multiple-times)
Merge remote-tracking branch 'origin/master'