Applying consistent naming scheme to globals, and marking locals as such.
Merge pull request #1 from alexandream/master

Applying consistent naming scheme to globals, and marking locals as such...