Merge remote-tracking branch 'upstream/master'
Added Return Device Function
Merge pull request #85 from kiranhugo/master

Added Return Device functionality