Merge pull request #313 from suskind/develop

fixed hasAttribute