wait for chongshen
Merge branch 'Armour-master'
slight change
Merge pull request #1 from lbenzene/master

merge from origin~