Merge pull request #29 from michaelandrepearce/NewYear