Bug Fixes #431 #412 #399
Merge pull request #479 from lingalamadhukar/bugfixes

Bug Fixes #431 #412 #399