Merge fixes for Issue #107

...ayDeviceReadout model