Stephen and Ivan added comments/headers

Unfortunately github is not awesome and rejected them.