Issue #15-Refactor code added to fix #5
#15-Adding missing paranthesis
Merge pull request #19 from jaipradeesh/issue#15

Issue #15-Refactor code added to fix #5