refactored StartupData parsing
Merge pull request #635 from nelenkov/dev

refactored StartupData parsing