Revert "Revert "Merge branch 'master' of github.com:jkx/DIY-Wireless-Bug""

This reverts commit 52684d4f470facb3a8ea764fa76e93ba7bea94fc.