Day 2.
Merge branch 'whisky-advent'