Fixed merge errors and file size variable
Merge pull request #8 from Thorgar/master

Fixed merge errors and file size variable