Issue #7 addressed.