Merge pull request #3 from sachingade20/automated_snapshots

 [mmell] Incorporated the review comments provided by mike on previous PR …
Fixed device check code issue