merge master
merge master
fixed key events to fire on left and right click and cleaned up some syntax errors