Merge with master

Updated NullMaker() code see if it passes build checks now