added stuff suggested by github