Merge pull request #220 from PJTNT11/sr_dev

abdd work