Paul's commit
Merge pull request #4 from githubteacher/pmkoenigfeature

Paul's commit