Merge branch 'master' into kyle
Merge branch 'master' into kyle
Change to variable names.
Code cleanup.
Merge branch 'kyle'