Merged changes from @neagle, adding share support to mini and bug fixes.