Merge pull request #1 from purplecabbage/Catchup