Converted all global variables to regular ones.
Merge branch 'chen_cucumber'