Merge pull request #11 from githubteacher/master

Githubteacher's contributions