Merge pull request #308 from Firefishy/more-404-tiles