Uuid fix w33ble

Merged develop, where #1 was delivered to, into #2's feature branch