Merged in Mini module from @neagle.