Fixing MB-699
:wq:Merge remote-tracking branch 'upstream/master'
Merge pull request #25 from ramith/master

fixing MB-699