add laser
Merge branch 'master'