array_walk doesn't alter keys, fixed
Merge branch 'feature_variable_interpolation' into feature_merge