Fix bugs with the 'R' key behaviour
Merge branch 'dev' of https://github.com/i-score/i-score into dev