wow changes from v1
Merge branch 'v1'