refactoring
Merge remote-tracking branch 'origin/wmy_local'