Merge pull request #497 from pratikmallya/bug_fix

Bug fixes