ID updates

4071 - 17433
Merge pull request #6 from tiago3961/patch-6

ID updates