fix regex
switch back regex
fix indentation
Merge remote-tracking branch 'heroku/master'