Mike781025 infobranch

Yu Hsiang Chang commit merged I add my pull request before merge his one...