Merge pull request #1 from spaetow/master

Update attribute-resolver.xml
Merge pull request #3 from Umbrella-Commiters/master

Merge pull request #1 from spaetow/master