Fix ID matching as ID's can contain "-" too
Merge pull request #1 from sztanpet/patch-1

Fix ID matching as ID's can contain "-" too