Merge pull request #392 from apache/geertjanw-patch-5

Tweaks and more info.