Reduce startup time
Merge pull request #149 from andig/startup-time

Reduce startup time