processed comment of Freek on plan.
Merge branch 'plan' of github.com:gbonnema/xmas into plan