JAGGERY-377
Merge pull request #80 from dhanuka84/master

JAGGERY-377