File size validation and some builder cleanup
Merge pull request #1 from Checksum/upstream

File size validation and some builder cleanup