Second commit by teacher
Merge pull request #1 from brain47/master

Second commit by teacher