Bug 161: Added warning to getVariable and deleteVariable when retrieving  variable that isn't there
Merge branch 'master' into reorganize