Homework redeux
Merge pull request #30 from froesecom/master

Homework redeux