Merge markit_two into markit_one (minor changes)