erorcun Merge pull request #1202 from AGraber/librw_update