Include startup by @gerricchaplin
Merge pull request #7 from adrianmoisey/startup

Include startup by @gerricchaplin