Changes for Master

@ExFideFortis00 please review and merge