(fix #55) Correct broken regexp and add client validation
3.0.14