gary fork
Merge pull request #1 from gv-rayalab/master

gary fork
claudio fork
Merge pull request #2 from cm-rayalab/master

test