fix type and change a better variable name
Merge remote-tracking branch 'origin/master'