Replaced hard-coding variable
Merge remote-tracking branch 'origin/master'