Added variable processing for functions
Merge branch 'dev-varprocessing'