jri changes
Merge pull request #1 from RILAB/master

jri changes