Merge pull request #2 from georgebina/master

Review ID-related parts.
Integrated and responded to latest comments from George