remove multi-declare variable warning
make explicit
Merge remote branch 'upstream/master'