startup update
Merge branch 'master' of https://github.com/rapport/rapport.net
start-up fix