Issue #114 - fixing in progress
Issue #114 fixed, pending verification