Patch commited.
Changes applied.
Small changes applied.