fixed hasAttribute
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #313 from suskind/develop

fixed hasAttribute