Merge pull request #330 from lynxis/rb_mrd6