Last night's homework
Merge pull request #40 from mike1372/master

Last night's homework