added variable handling
Merge branch 'master' of https://github.com/jstar88/Editable