ticket:3 Added comments