assign variables when necessary
Merge pull request #69 from Kar2k/patch-4

assign variables when necessary