Fixed TODO item on Ticket #6

Issue now closed.