.
.
.
Merge remote-tracking branch 'upstream/master'
Merge pull request #124 from kiranhugo/master

add ownDevice to activation process