Fix one-hand max
Merge branch 'master' into feature-animation