Mmg gap

Pull request to merge my pre-github dev branch back into develop.