Merge pull request #4 from Danubian/master

Merge pull request #1 from DrMrSrTeacherSr/master
Merge pull request #2 from DrMrSrTeacherSr/master

Merge pull request #4 from Danubian/master