Update makekit from master