Merge pull request #7 from lbenzene/master

merge from origin~
god damn ! all is over ! yeah~~
Merge branch 'Armour-master'