Return List instead of Set from getClasses
Alter lookup to use id if available to list element
Fixing condition to check for id existence
Merge pull request #37 from paterczm/master

Fixing condition to check for id existence