support dadush move
Merge origin/master