Improve read file
Cleanup
Merge remote-tracking branch 'origin/djole_m7' into milestone/7