implemented file reader with callbacks
removed merge conflicts