Minor correction to make code more readable.
Merge branch 'Iteration1' into Iteration1_ManagementSystem