Update to Source

Bringing fork inline with Mastacontrola source.