changes in bxiong branch
Merge pull request #16 from githubteacher/bxiong

changes in bxiong branch