BeagleBone now keeps state accurately
Merge conflict resolved