Merge pull request #2 from DrMrSrTeacherSr/master

Merge pull request #4 from Danubian/master
Merge pull request #5 from Danubian/master

Merge pull request #2 from DrMrSrTeacherSr/master