Merge pull request #22 from githubteacher/master

Tryagain
Merge pull request #25 from githubteacher/jecfeature

Merge pull request #22 from githubteacher/master