Merge pull request #34 from apache/UNOMI-848