Merge pull request #479 from lingalamadhukar/bugfixes

Bug Fixes #431 #412 #399
fixed issue 459
Merge pull request #480 from safiyu/newissue

fixed issue 459
Bug fix for #460