Added file reader
Added file reader
Changed exceptions
refactoring
Merge branch 'sammy' into development
Refactoring