Merge pull request #18 from apache/NicoK-patch-1