Merge pull request #1 from DrMrSrTeacherSr/master

MERGEEEE