Added #15 and #16.
Merge branch 'advent'