solve some bugs into lock / validate
Merge branch 'master' of https://github.com/Factor-X/awac