Merge pull request #162 from apache/Minor_fixes