Getting ready for next year.
Merge pull request #6 from JJ/master

Looks right.