some edits
Merge branch 'branch1' of github.com:7860845/onboard into branch1