Duy
Merge remote-tracking branch 'origin/master'
fix get gas function
Merge remote-tracking branch 'origin/master'