Merry Christmas!
Merge pull request #9 from Shaps/master

Merry Christmas!