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

c1 from develop fork