Saner variable names
Merge pull request #15 from voldyman/patch-1

Saner variable names