fix Nan error
Merge branch 'master' into statPage