Issue #9 - fixed, pending verification
Issue #9 - fixed, pending verification