Merge pull request #11 from githubteacher/master

Githubteacher's contributions
Merge pull request #3 from JHSPHshe/master

Merge pull request #11 from githubteacher/master