Merge pull request #148 from rajthilakmca/0.5

Issues are fixed
Merge pull request #149 from rajthilakmca/0.5

Fix some issues
Some issues are fixed