chengdh90 Merge pull request #1 from JasonWayne/mrs-2.0