add r. thanks eli
Merge branch 'master' into mac