cc
Merge remote-tracking branch 'origin/0.5' into 0.5
Issues are fixed
Merge pull request #148 from rajthilakmca/0.5

Issues are fixed