Changes for Variable handling
Merge branch 'master' of https://github.com/mhowansky/scow