Issues #4 resolved.