sovle bugs
Merge branch 'master' of https://github.com/factor-X/awac