Merge pull request #2646 from nabinhait/fix1

Minor fixes