shortcut keys
Merge branch 'ray'