Better regexp
Update name
Update dependencies