Initial commit
Merge https://github.com/brunete/startup