Issues #4 and #5 are resolved.