Add button tag to disabled check logic
Merge pull request #69 from kpdecker/button-disable

Add button tag to disabled check logic