0.4.2 variables update
fixing merge conflicts