inital mm
Merge https://github.com/rubyz/orchid131701