Update/improve regex (thanks to @marto83)