Merge pull request #6 from apache/bug-fix

bug fixes / updates