Accessibility

Some work related to issue #20