Code cleanup
Merging develop
ReadAllLines now opens the file with only read rights
Merge branch 'master' into develop