Pull changes from keycastr branch

All changes from the GitHub keycastr org's fork of keycastr