Accessibility changes for BH ticket 304
Merge changes for BH 304
Merge pull request #392 from thriuin/master

Accessibility changes for BH ticket 304