Merge pull request #2 from apache/variables

Change variable handling to not allow variables to be defined twice