fix #87, variable references should be returned
Merge branch 'master' into pilot