andypiper Merge pull request #15 from andypiper/r-rs-fixes