pull latest from jingle-bells to raven569

Wip/jingle bells