Fixed controls and updated data sending function
Merge remote-tracking branch 'Origin/master'