r61 merge
Merge pull request #9 from clover/r61

r61 merge