Optimize Regex and formatting
Merge branch 'master' of https://github.com/silverwind/idTip