Patch1

Pull request to merge patch1 to master