Merge pull request #9 from rbowen/main

Resolves https://bz.apache.org/bugzilla/show_bug.cgi?id=63260 - proviā€¦