Merge branch 'mac'
add
merge
move to win again
add plot to setting waves
add flagw
tmp comit
QQ
Merge branch 'master' into mac