Fixes by hpl.
updates
Merge remote-tracking branch 'upstream/master'
merge
Merge pull request #1 from hplgit/master

Fixes