Updates.
Fetched/merged from upstream and origin
Merge pull request #1 from hplgit/master

Feedback