Christmas update
Merge pull request #53 from wildewouter/christmasUpdate

Christmas update