Fix for attr-list
Merge remote-tracking branch 'upstream/master'
Merge pull request #19 from benweet/master

2 new fixes for special attributes