small change in the startup procedure
Merge branch 'github-master'