Updating with all current code from the BeagleBone
Updating
Resolved merge conflicts