more lenient, rfc 6891 + google
Merge remote-tracking branch 'SolveMedia/master' into HEAD