added contents
Merge branch 'ray'