added new version of ridc gem
resolved conflicts