Fixed todo on Ticket #6
Issue Closed