ID updates

1502 - 17452
Merge pull request #9 from tiago3961/patch-9

ID updates