ID updates 2

3176 - 17468
Merge pull request #15 from tiago3961/patch-15

ID updates 2