Merge pull request #125 from dreamteam69/master

Used variables correctly