updates
Merge branch 'master' of github.com:zhengf2/random-code-repo