fixed regular expression for line formatting
Merge branch 'master' into releases