Added keymaster 1.6.1 closes #2202