修改float为double
Merge origin/master