LIB001-902: Fixes for accessibility
Merge pull request #210 from ianthe/LIB001-902

LIB001-902: Fixes for accessibility