Merge pull request #1 from Baystation12/kunpeng

Kunpeng