Make sample_device better
Merge pull request #16 from equipmap/mas/make_sample_device_better

Make sample_device better