Use consistent cap. convetion for functions and class names
Merge branch 'newCap'