BUGFIX and working version. Regex fixed!