Merge branch 'master' into osx_zuffy
clean the code.
Merge branch 'osx_zuffy'

code cleaning.