Fixing issue : MB-695
Merge pull request #35 from ramith/master

Fixing issue : MB-695