merged with changes from master
updated the file size based on the last change