Merge pull request #11 from rdpeng/master

More RR stuff
Merge remote-tracking branch 'origin/master'

* origin/master: