Merge pull request #34 from JoesCat/master

Faster script due to fewer attribute tests done