Merge pull request #1 from rayalab/master

update
Merge pull request #2 from cm-rayalab/master

update