Minor bug fixes
Merge pull request #82 from ruwany/master

Minor bug fixes