ID updates

13401 - 17462
13402 - 17463
Merge pull request #12 from tiago3961/patch-12

ID updates