Merge pull request #1 from cm-rayalab/master

c1 from develop fork
c2 from master
Merge pull request #1 from rayalab/master

update