I made the patch to be in context format and I'll add this issue toCommitFest. Also, some code comments and style was changed to meet betterreadability.