Incorporating nmadura's BeagleBone changes