This *might* fix the end-of-week exception, but honestly, I didn't test it. :)
Merge pull request #6 from b-jazz/master

This *might* fix the end-of-week exception, but honestly, I didn't test it.