Merge "Added FileReader and FileWriter classes to wrap FileCloser" into devel/master