Merge pull request #24 from TrentBartlem/master

christmas update