Merge pull request #4 from breznak/keep-set-variables

Keep set variables
Merge pull request #2 from oxtopus/master

Merge pull request #4 from breznak/keep-set-variables