Merge pull request #938 from nabinhait/fix1

Minor fixes