spouse fixed
Merge branch 'master' of github.com:dkdfirefly/adb