restore missing vars
and test it
Merge pull request #25 from nens/fedor-vars

restore missing vars