Merging changes from Key-Color-Acceptable-Tester