Some issues are fixed
Merge pull request #155 from rajthilakmca/0.5

Some issues are fixed