Merge pull request #127 from syedautherabbas/master

Changed naming conventions to be in line with java. 

Closes #122