ADD LASER
FIXED laser
Merge branch 'paavo' into dev