Do not use one-letter variables
Merge pull request #131 from sheerun/fix/naming

Do not use one-letter variables