Auto-start change
Auto-start #2
Merge branch 'master' of https://github.com/tjuuljensen/poseidon