Added some explicit variables
Merge remote-tracking branch 'origin/master'