Merge pull request #321 from atong-tcs/rdpdr