Fix for special attributes
Merge pull request #18 from benweet/master

Looks good. Thanks!