Merging changes from Color-Contrast-Tester branch