erorcun Merge pull request #1203 from AGraber/miami_librw_update