Merge pull request #671 from Talljoe/one-hand