Merge pull request #11 from apache/optional-proper