Fixed merge conflict.
Rebased from master.
UserID no longer necessary parameter.
Simplified docstrings.
Fixed tests to run with multiple keycodes.