Fix some issues
Merge pull request #149 from rajthilakmca/0.5

Fix some issues