Adding bug fixes
Merge pull request #84 from ruwany/master

Adding bug fixes