bug fixes
Merge pull request #266 from raghuvissu/master

bug fixes