Better naming convention
Better naming convention
Better naming convention
Merge pull request #128 from voter101/master

Better naming convention