Add and delete devices asynchron
Merge remote-tracking branch 'origin/master'