fix something, add avivary
Merge branch 'origin/master'
trung