Merge pull request #4 from brawner/master

End of Sunday