Just a comment on style (this applies to other modifications as well): please adjust your IDE to use only 2 spaces per indent level to be consistent with the rest of the project.