Merging AffinityId current version
Merge pull request #23 from AffinityID/AffinityId

Merging AffinityId current version