CHANGE: Update the makefile based on the latest Standard version