Revert "Revert "Merge pull request #465 from Gama11/StartupSize""

This reverts commit e5642f9d0ce039692a3aea5a5d0c09623b9c7817.