Merge pull request #385 from apache/geertjanw-patch-17-2

integrating two pics