version 2
Merge pull request #1 from hedder/Aff-functionality

version 2