issues fixed
Merge remote-tracking branch 'origin/0.5' into 0.5
Fixed issues
Merge pull request #199 from rajthilakmca/0.5

Fixed issues