Changes done as per ruby style guide
Merge pull request #302 from narutosanjiv/master

Changes done as per ruby style guide