Client validation fix
Merge branch 'master' of https://github.com/wiredo/AwDemo