git fixes
Merge pull request #698 from inc0/hotfix/attr

git fixes