Added WAI-ARIA support, issue #397