Fixed issues #371, #372
Merge pull request #385 from lingalamadhukar/bugfixes

Fixed issues #371, #372