Add tap to change, fixes #25