Bug Fix 2
Merge branch 'master' into test_version
Rewrite ReadData