fixed known bugs
Merge branch 'master' of github.com:danieltcv/Readout-Test