Merge pull request #264 from raghuvissu/master

bug fixes