ID updates 2

1519 - 17466
1520 - 17467
Merge pull request #14 from tiago3961/patch-14

ID updates 2